Merge "Fix whitespace errors" into stage-aosp-master am: 2d6291fdc0 am: 826a63b957
am: 26c35bc52a

Change-Id: I5858fa57ae60d80f97ff513f25308ea56b27cb4a