Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev am: 6fddc2472e
am: 7096712148

Change-Id: I398d64f93c5061d031c18fcd5a1bfcba9fb96898