Fix trailing spaces

Change-Id: I878ab1238dd9e391aa02f287039155c3a6a61ca6
Merge "Fix trailing spaces" into production