Merged from https://widevine-internal-review.googlesource.com/175050 Change-Id: I28e4b1bc1f82deaf5644d0b2e31d916bf65365d3