Bug: 8725707 Merge of https://widevine-internal-review.googlesource.com/#/c/5302/ from the Widevine CDM repository Change-Id: If142e558585e5cc7ba0cecf45693413943b2b64f