Initial refactoring to group IP-related elements into an IpManager
am: a636761bd6

* commit 'a636761bd67963385397ee920dcf76ec7cf113fb':
  Initial refactoring to group IP-related elements into an IpManager