Merge "Add Callback for Registration Failure" am: 93db49faec am: 5532d79f90

Change-Id: I5e6e2b3b41b24e6122963644633d63d14e8a7605