Merge "Bug fixes of DRM framework."