Bug: 273347757 Merged from https://widevine-internal-review.googlesource.com/168937 Change-Id: I0f878cab8456fa277a453d76e4deb4a2a846ede9
Bug: 273347757 Merged from https://widevine-internal-review.googlesource.com/168937 Change-Id: I0f878cab8456fa277a453d76e4deb4a2a846ede9