Merge "Refactor to IpNeighborMonitor and single-threaded semantics" am: b501e7e25b
am: c4ca15786f

Change-Id: Ic6466a83f6b8e128a74321bb37da21e6d2c174e7