Merge change Id434c469

* changes:
  More OSNetworkSystem cleanup.