Remove unnecessary return

Return is unnecessary as the last statement in a function with no return value

Change-Id: I8dadac8c35165a81eeb318bb2644b4521e23d751
Merge "Remove unnecessary return"