Merged from https://widevine-internal-review.googlesource.com/174934 Change-Id: If44423ed51cc2ff10c1b471d39db962a653d8c14