[ Merge of http://go/wvgerrit/113563 ] Bug: 159847851 Test: WV unit/integration tests Change-Id: I138b3e3291cb9e75841d092ca1bfa9a652ad9f9a