Merge "[7/X] Clean up logging in CDM"