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

Change-Id: I7098716f70e0f18b75cd45ce3dab5d749ae34c6d