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

* commit 'c45fb6a2338edd7c900fcd3612da79ec9d0a43e5':