Merge "[cts] fix build break" into mnc-dev