Whitespace fixes

Change-Id: I2228c7fd955a0afd74f5feea9982df5927350ddf