Consistently deal with onRegistration() transport errors.
am: 7fafc144d1

Change-Id: I8350b2c767e0be6ce5e93123595e3b9a585985d0