Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev