Merge of https://widevine-internal-review.googlesource.com/#/c/7280/1 from the Widevine CDM repo. bug: 10396953 Change-Id: I085b60e01292f37379d19d059b39ac7a7f299012
Merge of https://widevine-internal-review.googlesource.com/#/c/7280/1 from the Widevine CDM repo. bug: 10396953 Change-Id: I085b60e01292f37379d19d059b39ac7a7f299012