Bug: 19771612 Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/13885/ Change-Id: I754f06a7ed9476554f9e1da3fe23f4563f9fc07e