Remove unneeded else{} and return

Else action was default. Returned the result of a void function.

Change-Id: I9ddf051ded0228dd3dfdfe9312f467d9c57f1716
Merge "Remove unneeded else{} and return"