[ Merge of http://go/wvgerrit/111507 ] Bug: 174195349 Test: WV unit/integration tests Change-Id: If8eb2c6ba326ed246da7adfa1137e16fe69bb044