wifi fixes

Change-Id: I424f2e0fba230b84e99ecf177faa66ead3bb59b4