Merged from https://widevine-internal-review.googlesource.com/176771 Change-Id: I8afee6636a44f46a573be5a94f6c12161b57eace