Merge "Migrating remaining core networking tests to Junit4"
am: 96dbac0c5c

Change-Id: I3d5c8274f76d00c61a384213ade1fae97c96ae24