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

Change-Id: I1aa820a7d9bd4c04174e3fc7f93505e2083994d6