Merge "[Tether03] Migrate IpServer into module" am: 634c6a512f am: c8c297544c
am: 5724764344

Change-Id: I3e70612aa3071889c5b2c74217b9c33c587e35bb