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

Change-Id: I2f63d9f288cba8186e6114860265b5347abf3bdc