Merge change I5cae54d2

* changes:
  More OSNetworkSystem cleanup.