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

Change-Id: I65ed1eb721d194c34fc475b461b28386eee206e0