Merge "Fix CtsNetTestCases in instant mode"