Restore wifi patch for compatibility

Change-Id: Ie945c2435e4b782d224afe885516e9b58729b691