Merged from https://widevine-internal-review.googlesource.com/194911 Change-Id: I366df6f46622d6333e7f77cbef3cb5dc9b1d2710