[automerger skipped] keystore: abort if verification token generation fails am: 36a9f4ff40 am: c0b14a8113  -s ours
am: 595335c577  -s ours

Change-Id: I9157a9be6330a9993e4e8deab130c1991b08d636