Merge changes from topic "am-0f53dad1f009493ea42909cd982cb371" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda am: f4e7d32a am: d861765f -s ours
  [automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 8bcf198c am: 7d36cdb6 am: ebc04eff -s ours