Use consistent return type

Change-Id: I7127121195654c2c02da342507103ee6a70c6027