Whitespace cleanup

Change-Id: Ia98e436a45290bf6b3d468df63903d7d45f6e0e2
Merge "Whitespace cleanup"