Merge "Keystore 2.0: Provide confirmation token to operation."