Merge "Wifi hotspot stack initial hook up"