[ Merge of http://go/wvgerrit/102804 ] This addresses post-merge review comments. Bug: 150393659 Test: WV unit/integration tests Change-Id: I221ed1c82b20bd0c2b0b824a2d52a2dd918fa459
[ Merge of http://go/wvgerrit/102804 ] This addresses post-merge review comments. Bug: 150393659 Test: WV unit/integration tests Change-Id: I221ed1c82b20bd0c2b0b824a2d52a2dd918fa459