Merge "Renamed DataSpecificRegistrationState"
am: 86675ed5c0

Change-Id: Ice5fa2213a8a1850e6a6842c197d5926c0193b3c