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

Change-Id: I21c3391f072e2f38422de818ff1f7c6795fbaca7