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

Change-Id: I8716a2f49c6adec97b260c32d65d53414068e41d