Minor whitespace fixes

Change-Id: If7989342817ab926cd4d0e8bf1d4e4674b07ffce
Merge "Minor whitespace fixes"