Merge "Networking unit tests: fix some flaky tests" am: 501bae6492 am: b87cf12ad3 am: 741fdea598
am: d0f5955d6d

Change-Id: I6673a65a09214911063824d9beffe40b6376c380