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

Change-Id: I581640e692dae781d2592fcab26839c251631df7