Fixing some white space errors

Change-Id: Ic101779753898a7618f6c253ad7571cbf6228d08