Merge "Move more network unit tests to common tests"
am: 4a208ae14a

Change-Id: Id130368cd87ed262ef8eb926adf7b80fc3d7c2e3