Whitespace fix followup to I72aba35

Change-Id: Icd4c44a1dfd1d7365ea1b74e051473926059c5ba
Merge "Whitespace fix followup to I72aba35"