Merge "Fix for DropBoxManagerService on devices with large storage"