Wi-Fi fix (EXP)

Change-Id: I9ac0a766b4c0781bf168e19d5a11e8794b586b1d