Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev