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