Merge "Do not create drm directory here. Fix for bug 3134576."