Merge "Fix for DropBoxManagerService on devices with large storage"
am: 52cd14f17f

Change-Id: Iecf0747f43655ef6e99681f55dd64a2b51b38c28