Merge "Replace more obvious private API usages in view CTS tests" into mnc-dev