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

Change-Id: Ie97a6001eb23314c65aff291f53cf575b7637870