Remove redundant else, none returned by default

Change-Id: I5ad90fab3105ce07d979dedde2b165453d80c0ec
Merge "Remove redundant else, none returned by default"