Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev