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