Merge "Add null check to IpManager.dump()" am: 58406d1df2
am: c5bca697ba

Change-Id: Id5ebbea0c64baa24d162c0545d45915c948f45e6