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