Merge "DRM Framework bug fixes."