Merge "Add NetworkStack tests to postsubmit" am: f4fb1b5251
am: 4a19a149db

Change-Id: I544dc328b01137abfb001c0529a45843fd37b0f1