Merge "Fix the other app's scoped directory permissions are revoked" am: c7f7267e99
am: d7558462bb

Change-Id: I12dee90d1c0ad225ef506d5309cd92aba7f935dc