Merge "Address some comments on IpManagerTest"