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

Change-Id: I28ef3693ade9dc0fd53437b0157d47237e6a3f93