Merge from Widevine repo of http://go/wvgerrit/122123 Bug: 171912044 Change-Id: Ic7459870ac532f04f254913e685a306dbdfe1f7a