[ Merge of http://go/wvgerrit/103643 ] Bug: 161417560 Test: WV unit/integration test Change-Id: I2d7e3b90e2e34e7854dea7aac865f8577d113aab
[ Merge of http://go/wvgerrit/103643 ] Bug: 161417560 Test: WV unit/integration test Change-Id: I2d7e3b90e2e34e7854dea7aac865f8577d113aab