Merged from https://widevine-internal-review.googlesource.com/174893 Change-Id: Ia46e74450bc20302edaf1c5e2bbde957a1d31c95