Merge "Fix a broken CTS test" into mnc-dev