Fix wifi connectivity issues. am: 78ed25af23

Original change: undetermined

Change-Id: I2338ed09b4b804204ea1f0f44ad0e9329492cd3c