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

Change-Id: Ib5b6a0c7b35d9dfb43d97c31eceb7e7b7564b294