Merge "Fix testTokenBasedResetPassword."