Merge change I318b1449

* changes:
  More OSNetworkSystem cleanup.