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