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