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

Change-Id: I1f12a3144ef80310789ef231952159b456997efd