Merged from https://widevine-internal-review.googlesource.com/175060 Change-Id: I2f245ac998883e2a31cde361e30b36f00681262c