WI-Fi fix (EXP)

Change-Id: I420a5f71fb3f38fb16a455784a93d798b02c0a83