Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/13840/ Change-Id: Iefd2c6c38dcbec1571f5965eb7e6b30e011cf65b