Merge "IpManager: add display name for helpful logging, and Network" am: ed0b030e17
am: d0c68dec76

Change-Id: Ie650f985c17d16e972e43e66653561200d2e4ef2