Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev am: 04d2f143 am: 195fba40 am: 621575ed am: 6ae00261 Change-Id: If94949893eb96fd126fd24900477f691941cd039