Merge "Remove garbage spaces" am: b29fb46920

Change-Id: I1fb3e6a7f598be9ea8d993a39e3f3ee6ac554f4d