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

Change-Id: Id95a8ef670b8f84664c518d19df449720ae90eb2