Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev am: c619ad77bb
am: 3ae7bacff4

Change-Id: I6c0e42bc214d68628e65ea2c90852b282f935690