Bug: 21324836 Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/14392 Change-Id: I2a8da14c98f8ae0fece3667b6f6b8517577f8a98
Bug: 21324836 Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/14392 Change-Id: I2a8da14c98f8ae0fece3667b6f6b8517577f8a98