[automerger skipped] Merge "Add Callback for Registration Failure" am: 93db49faec am: 5532d79f90 am: 8d2f9806c7 -s ours
am skip reason: Change-Id I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99 with SHA-1 5e6e983cad is in history

Change-Id: Ia3177326f23b30204e28bd117bd6ad65035e6225