Merge "Merge "Fix 'verify it's you' string by using the correct single quote." into rvc-dev am: 6688c811a2 am: 5159eb8b6a" into rvc-d1-dev-plus-aosp