Merge "Allow wificond to find permission" into oc-dev