Merge "Grant SharedStorageBackup storage access." into pi-dev