Merge "Remove garbage spaces" am: b29fb46920 am: fcce9c56d4

Change-Id: Ifb22ae812e5473c54d2a963eb60e9ef04af3ae9f