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

Change-Id: I8c2a70819cf1acf8b6edd8743f7c536a580ce66a