Merge "Initial rename to IpServer"
am: 31830456cd

Change-Id: Iac2c2fddae78fe642ebdc6e5acf12dffcb636d22