Merge "Rename REGISTRATION_ERROR protected broadcast"