keystore: abort if verification token generation fails am: f8feed620b
am: 19eb2b4c35

Change-Id: Ib60ad7583f4ce45f4a374e71e0c441d796133483