[ Merge of http://go/wvgerrit/54802 ] BUG: 110954967 BUG: 110960064 Test: WV unit/integration tests. Change-Id: I3c5263f304ec9c9734a6761cbd7db46ccb476e9e