Cleanup whitespaces

Change-Id: I6edcf321581854cdde95bbdb36a379ef8518bff5
Merge "Cleanup whitespaces"