Merge "Fix ResetPasswordWithTokenTest failure" into sc-dev