Merge changes I2388220a,I5f282160 into main

* changes:
  Add a test for delayed teardown with unregisterAfterReplacement.
  Fix system crash when netd return error