Fix Mac build (control reaches end of non-void function).

Change-Id: I94d85f1848db7c787f423ca9e7f7695ffd754a56
Merge "Fix Mac build (control reaches end of non-void function)."