Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev