[ Merge of http://go/wvgerrit/24445 ] Test: Verified by wv unit and integration tests b/36048120 Change-Id: I9d067e79654331e8e58df5dce5411fbadc73e575
[ Merge of http://go/wvgerrit/24445 ] Test: Verified by wv unit and integration tests b/36048120 Change-Id: I9d067e79654331e8e58df5dce5411fbadc73e575