am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '3c4cfdab8ef45fd94de3acb4f95dd35defa58a41':