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

* commit 'b560642ed128cd78cba2307b45fff6db5545f49e':