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