Merge "More CDM presubmits" into tm-dev