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

Change-Id: I9f708a252ab606b782f5f828dce8c1690c3703bf