Merge "Fix checkUsesFeature() in CdmService"