Fixes for wifi

Change-Id: I5d41dc873d53bdefe3c19c5f51d491d34bfdb147