[ Merge of http://go/wvgerrit/66283 ] Bug: 78773763 Test: WV unit/integration tests Change-Id: I5050295a7aa6d829a66adce5d5de86b725a82738