Merge from Widevine repo of http://go/wvgerrit/165958 and http://go/wvgerrit/165862 Bug: 275264353 Test: test only code Change-Id: I30829ad72d58e2233f4cc9963d17cb07314b7720
Merge from Widevine repo of http://go/wvgerrit/165958 and http://go/wvgerrit/165862 Bug: 275264353 Test: test only code Change-Id: I30829ad72d58e2233f4cc9963d17cb07314b7720