Merge "Fix for the incorrect size of the new added DRM file. (bug 2897238)"