Merge from Widevine repo of http://go/wvgerrit/139372 Change-Id: I95b65d718fb01344405ad6d68bde16f3fde65334