Remove unnecessary returns

* remove duplicated xtrace
* remove some unnecessary return

Change-Id: If9e0a979e0bd5a334e82d42572ac0b149de341d7
Merge "Remove unnecessary returns"