Merge "Add R scoped storage app-ops"