Merge "Fail if there are repeated fields in atoms.proto" into rvc-dev am: 19282c3930

Change-Id: I16e2912c6c193f14f660beadd4f6276a12553ade