Merge of https://widevine-internal-review.googlesource.com/#/c/10845/ from the widevine cdm repo. Bug: 12247651 Change-Id: Ice6ec95865640fa2f736c7a9f09956395d648337
Merge of https://widevine-internal-review.googlesource.com/#/c/10845/ from the widevine cdm repo. Bug: 12247651 Change-Id: Ice6ec95865640fa2f736c7a9f09956395d648337