Merge of https://widevine-internal-review.googlesource.com/#/c/10309 from the widevine cdm repo. bug: 15341137 Change-Id: I188d7d7a3861dcbec1950dfbe8dd9504a60899bf
Merge of https://widevine-internal-review.googlesource.com/#/c/10309 from the widevine cdm repo. bug: 15341137 Change-Id: I188d7d7a3861dcbec1950dfbe8dd9504a60899bf