Merged from https://widevine-internal-review.googlesource.com/183806 Change-Id: I0d56b6a1f3056de5985a4acfa24dc2e03a6ac193