Merge "Change storage migration to use quota APIs." am: 0fccecc6a0 am: 83fabf2fd6  -s ours
am: 034d66ec5d  -s ours

Change-Id: I08a0a73e8238a1a6caf876665aa01e7c3384a1b0