Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev am: 04d2f143cd am: 195fba40d3 am: 621575edf5

Change-Id: I21476a51334cf8456b3a3490f4522770f0b8bd2a