Merge "Fix testResetPasswordWithToken."