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

* commit 'c0d6dd512722ae36242924bcdc8fcde58dd5c959':
  Fix some style nitpicks