This is a merge of http://go/wvgerrit/10846/ from the Widevine repository. Change-Id: I682069073d9ec58c03781de25d9c6fa5ec5864ff