[ Merge of http://go/wvgerrit/75303 ] Bug: 117181780 Test: WV unit/integration tests Change-Id: Ica12e270a9ac5fbcff069aace807bb4651814ad7