Merged from https://widevine-internal-review.googlesource.com/174936 Change-Id: I79bbb8506a13d3142a8b323a7c67d0155973a3f4