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

Change-Id: I4b1b08444473b3ebac4daea09528d6c071614348