Merge "Fix usage of the updated CDM APIs"