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

Change-Id: I5f392cb23da265eecfdb07456066ba1b3c376d2d