Merge "Fix roundtrip failure with groups when unknown fields are enabled."