Merge "Fixed whitespace for Gerrit 393"