Merge "[WIFI] Restore initialization code" am: 8f4416aabb
am: 3ae14f0ead

Change-Id: I96f5c77e7f9ee3b84f4a6cf7973638d3d4bba68d