am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '2cb17b1847eb7d6d0d1180bc0f16fca0255987d2':