Merge from Widevine repo of http://go/wvgerrit/24688 b/35466719 Change-Id: If89f0cad0c61f37536a84f8dadaf08072356343a