Merge "Update of DRM framework."