Merge "Address some comments on IpManagerTest" am: b2afa1ede5
am: dea2371e71

Change-Id: Iac9eccca662fccc2da7d81c6d86d1623cccef342