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

* commit 'ea2aa987f490d298bb8bcc5c863c3701a28e10b3':