This is a merge of http://go/wvgerrit/13929 from the Widevine repo. Change-Id: Ic0dea9a0a263fe68bea5ca6c87f5d8e8356ed77c