Merged from https://widevine-internal-review.googlesource.com/174851 Change-Id: Iebddae2412c66dbaf5bac042518aea58f9b0c315