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

Change-Id: If3ed216fd7e7a33009c7fca6e6a6a92cf42cf3a0