am f4278b6c: am 10288e2c: am 623e3f9d: Merge "Fix cosmetic source code formatting"

* commit 'f4278b6c338973ea254b6163e0b4904746abc5da':