Merge of https://widevine-internal-review.googlesource.com/#/c/8480/ from widevine cdm repo. Change-Id: Idb5ab83bceeb97016075c26c428aba692f017929 related-to-bug: 11967440
Merge of https://widevine-internal-review.googlesource.com/#/c/8480/ from widevine cdm repo. Change-Id: Idb5ab83bceeb97016075c26c428aba692f017929 related-to-bug: 11967440