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

* commit '6988e26be6d502789e7c1bed36e72873546d223a':