Merge "Deprecate legacy Drm APIs"