am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':