Merge "Migrate most of core networking tests to junit4" am: 9d456cd9 am: 7d9588c8 am: c40687f8 am: 550de399 Change-Id: I44024c6cfe2bcb66f00a39ac9d97182ff62a23d1