Merge "To support DRM files without file extension"