Merge "Initialize the NetworkStack before WiFi"
am: 6d0186de88

Change-Id: If852f57a4164d1422605c3477d036cc953179620