Merge "Add support for WV DRM"