Merge "keystore: Pass verification token to credstore along with requested auth token."