Remove all unnecessary whitespaces

Change-Id: I3f3841a6bba2a2a00f7a0eb8a1b6757405820257