Merge "Fix whitespace errors" into qt-dev-plus-aosp am: 9efb491ad9
am: 57b6021679

Change-Id: I429f556ff477d73c555a626ff288a9c9dd1da611