There were some unsolicited trailing spaces in the code. Removed them. (cherry picked from commit 964c6532f2)
964c6532f2