Merge "Revoke the uri permission when the file is deleted" into oc-mr1-dev