Merge "Change storage migration to use quota APIs." am: a0afdb0c49
am: 46b8d7ac78  -s ours

Change-Id: I80143a5cad80860f2af912adbdaad8690601a798