[automerger skipped] Merge "Fix NetworkStackTests." into qt-dev
am:841dc62b5a-s ours am skip reason: change_id I0d60d7a317fa60607d6fdaea15f61b458aefd2f0 with SHA10e5459731fis in history Change-Id: Ia25198b3ed7d4704ffa3bd50a5399a81ff26cb7a
This commit is contained in: