Merge "Initial rename to IpServer" am: 31830456cd am: 38f2c4ea08
am: 8c6df2e9ec

Change-Id: If68b905ceeab03fc974846c52951f49b00946c71