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

Change-Id: Ia9b1a4a3c5981b2c9a83a97c266f79cd33d7c3b3