Merge "Update of DRM Framework."