Merge "Change storage migration to use quota APIs." am: 42a57522c5
am: dbebdcd612  -s ours

Change-Id: I41f260e58beacb811a5b9f79eb9f1b0bfbece689