Merge "Add NETWORK_STACK permission" into oc-dev