Merged from https://widevine-internal-review.googlesource.com/195130 Change-Id: I44760c19bc1457017ffacdda5f3c40f4a66edccb