Merge "Move the NetworkStack tests to unit/ to add an integration test." into qt-dev
am: 35dd095a4f

Change-Id: If5881cf6cef339f76b1ab914bb45f6f4b87e1577