Merge "Update the DRM API to support new offline methods"