Merge from Widevine repo of http://go/wvgerrit/54540 Addressing comments in http://go/ag/4448747 Test: tested as part of http://go/ag/4674759 Change-Id: I29005397efcc2e982e635581cc68c8293cea6243
Merge from Widevine repo of http://go/wvgerrit/54540 Addressing comments in http://go/ag/4448747 Test: tested as part of http://go/ag/4674759 Change-Id: I29005397efcc2e982e635581cc68c8293cea6243