Fix whitespace issues
Bug: 63742

Change-Id: I6fd1986d1ad67bad600a9617d071fda9a28c8cf6