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