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

Change-Id: Ic03f2b0fff1860c944453f9fe97f0ecdf3dfde44