Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev am: 04d2f143 am: 52131232 am: 81ce5f29 Change-Id: I7c80322437a94690af636bfb471f4ca2a7f2fa86