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

Change-Id: I9f0f828d542e337f185c4a423748f57ef53a00ce