Merge "add netutils_wrappers" into oc-dev