* commit 'd52f7a3e2f3d4dba9b8c134dc2fa2a54ddd1ce17': Make generated code more aligned with Google Java style.