Merge "Change storage migration to use quota APIs."
am: 42a57522c5

Change-Id: Ica12e7378f6c67a488bc66fcd33be72cacca811b