Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6
am: 7d9588c836

Change-Id: I3a02bcf20f59c2a07b7c920707cf6cde0bf68478