Fix WiFi Tethering

Change-Id: Ifcc3f0af4413eddc7ad3eb7a54b4fdcfdc2ce6a3