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

Change-Id: Ic24feba3904c6f242782325f644a527ba3a5490d