Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev