Merge "Add wifi permissions to shell" into oc-mr1-dev