Fix wifi interruptions

Change-Id: I9d108bdd841625ae045a47a0921203b70f365fc4