[ Merge of http://go/wvgerrit/70865 ] Bug: 116643233 Test: WV unit/integration tests Change-Id: I13aba71d120dc25950b8ccba4091800835aaaaf4