bug: 277124807 Merged from https://widevine-internal-review.googlesource.com/177958 Change-Id: I867d664a73ceba7391b5054365c4352a7c6aa301
bug: 277124807 Merged from https://widevine-internal-review.googlesource.com/177958 Change-Id: I867d664a73ceba7391b5054365c4352a7c6aa301