Merge "Use AccountAuthenticatorResponse properly."