Merge "Remove obsolete drm manager code"