Merge "Change storage migration to use quota APIs."