Merge "Fail if there are repeated fields in atoms.proto" into rvc-dev am: 19282c39 am: 30d68b97 am: 4ea07f70 Change-Id: Ife9062476faf2e76ee0d1bb018bf9a3435b21683