Merge "Revert "Fix cts coverage report inclusion of incorrect classes"" into mnc-dev