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

Change-Id: I23ad8654d0116b5535f74e6e8c31b8d7ea83d5b8