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

Change-Id: I860caa2e35a1af8ccab4f85e9ab04a37d283416e