am f7cab2e5: 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 'f7cab2e53d8cdef0cda6762fa92c0e4828f87d51':