[automerger skipped] Merge "Migrating remaining core networking tests to Junit4" am: 96dbac0c5c am: a3c2022836  -s ours
am: 4300e8e2ba  -s ours

Change-Id: I29358e012c542c7009b5b19a8a3a26ccf21d1c97