[ Merge of http://go/wvgerrit/46640 ] Bug: 72994956 Test: WV unit/integration tests on walleye, sailfish and linux. Change-Id: I7319a4b79ab9a02e0ca9a50fb48c6107f8c3a762