Merged from https://widevine-internal-review.googlesource.com/188677 Change-Id: I17346b54259ca1929ef40a8d61aef38969800159