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

Change-Id: Icc89e446b80e57a196861263bbcd824553db56c0