Merge "Move the NetworkStack tests to unit/ to add an integration test." am: ee18cdc67b am: 51dfffac9b
am: f451bafa48

Change-Id: I4fd8a01abd43d17cfb656477b21f02fe5f2ab01a