Merge "CTS coverage tool improvements" into mnc-dev