Remove all extra spaces and cherry-pick this commit.