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