Merge changes If41d957f,I5c49d195 into 24D1-dev

* changes:
  Fix empty network scan result
  Create NetworkScanRepository