Merge "Optimize checking if package defines companion services in CDM" into tm-dev