Merge from Widevine repo of http://go/wvgerrit/169062 Bug: 269670984 Merged from https://widevine-internal-review.googlesource.com/167378 Merged from https://widevine-internal-review.googlesource.com/167369 Change-Id: I309aff7aa0e7f662893f20e54975009c427a525f