Merge "Fix CtsNetTestCasesLatestSdk fail on Q platform"