Merge "CTS Coverage Report Support for generic types" into mnc-dev