Merge "Add more check before using the DRM manager client."