Merge "Enable email in TemporaryPasswordPrimaryAuthenticationProviderTest"