Merge "Create a new NETWORK_SETTINGS permission" into oc-dev