Silence false "control reaches end of non-void function" warning

Change-Id: I4614f445b23aa5c498b7b64a181cb5ca74f18081