bug: 11534771 Merge of https://widevine-internal-review.googlesource.com/#/c/8291/ from the Widevine CDM repo. Change-Id: I76110013838f91c8009fe710586226c96de890be
bug: 11534771 Merge of https://widevine-internal-review.googlesource.com/#/c/8291/ from the Widevine CDM repo. Change-Id: I76110013838f91c8009fe710586226c96de890be