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