Merge "Fix CTS post submit failures"