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

Change-Id: I561d90036c6600f1fc9f2ef9e8f22e9e8a330e9e