Merge "Various updates to CTS coverage tool" into mnc-dev