Add forgotten return statements

Change-Id: I319da1befac94ca01fe931f006d5739967eff92c
Closes-bug: #1268934