Merge "CTS runner fixes" into mnc-dev