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

Change-Id: Ia9b7742281bfa641aa644c65b6baaf72df0358a5