Merge "Fix shared-storage full backup"