am 800005e0: am b560642e: am 0f428aae: am c0d6dd51: am e8a30f37: Merge "Fix some style nitpicks"

* commit '800005e087f24be2a21baf6bbead822a465a7055':