Merge "Initialize the NetworkStack before WiFi" am: 6d0186de88 am: b07d868c53
am: 991b27b67b

Change-Id: Ia92b6a8b9c2d23b5ea496fa0eca74de3292abd90