Merge "Renamed DataSpecificRegistrationState" am: 86675ed5c0
am: 5a1db25c73

Change-Id: Ibb0ca2e282ff3671d520a9367a65b281e18ca1d7