fixing return values for non-void functions for strict compilers.

Change-Id: I6988beacc14d897b1c97a0827d19c7fc48ab1f27