Merge "Wifi: Remove premature 'return'"