Merge "OPP: Restrict file based URI access to external storage" into oc-dev