[ Merge of http://go/wvgerrit/93745 ] Address a missing return statement. Bug: 139397537 Test: WV unit/integration tests Change-Id: I35cfc432766c7ba90d97fea5eb2d1a4f15ca0942