Merge "Skeleton of an IpManagerTest" am: db4333a2c2
am: cf07e0d541

Change-Id: I9b0ed1aff8ba7d5465bff3d6fa8f9048153c8a44