am d7c3ac0d: am ea2aa987: am c0d6dd51: am e8a30f37: Merge "Fix some style nitpicks"

* commit 'd7c3ac0d6cb2d2f273099d9f45eb7238752bf5fb':