Changes to make WiFi work

Credit/Thanks to CM

Change-Id: Ia98a0048f3c7b7fee29d2df34b5fa1b929999ecb