COMP: Remove unreachable return statements.

For

  warning: 'return' will never be executed [-Wunreachable-code-return]

on newer Clang.

Exceptions are thrown before the return statement.

Change-Id: I0e96529d1fb83e4a2dba36168585bb3a92d5a8fc
Merge topic 'unreachable'

89893349 COMP: Remove unreachable return statements.