Merge "Fix NetworkStackTests."
am: e4d640b3a8

Change-Id: Ia02f3b4788ddc7fac3327b82d0b3f2bf8c19d49b