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

* commit '0f428aae3b231b57a4fa3774373ee701bf96c212':