Merge "Add NetworkStackTests to device-tests suite" am: d989ed753d am: 8878aec7b7
am: 5e91ce2fb2

Change-Id: I4684819ec77a9b39672441d8a4c59704260b4d11