Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/13345/ Bug: 19592752 Change-Id: I73a215f9e67330caaced0110262448973aaae0a7