Merge "[automerger skipped] Merge "Renamed DataSpecificRegistrationState" am: 86675ed5c0 am: 5a1db25c73 am: f416a3ed0b -s ours am skip reason: change_id I1a623c18f02cfd19ca1af9df912d859b363f42d1 with SHA1 dba103204c is in history"