Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda57 am: f4e7d32a7a -s ours
  [automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 8bcf198c67 am: 7d36cdb6dc -s ours