Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev am: 04d2f143 am: 195fba40 am: fc5d4307 Change-Id: Id724f44ea3a79150970e5f36f1efcfacf629fb84