Merge "Add null check to IpManager.dump()"