Bug: 277115746 Merged from https://widevine-internal-review.googlesource.com/170050 Change-Id: I744f4fe1837b776b50693a40535484e8fae092c4
Bug: 277115746 Merged from https://widevine-internal-review.googlesource.com/170050 Change-Id: I744f4fe1837b776b50693a40535484e8fae092c4