[ Merge of http://go/wvgerrit/67503 ] Bug: 117118184 Test: WV unit/integration tests Change-Id: I8db90c1617e068a4711eb41a5852d15b5e228f2f