Merge "Change storage migration to use quota APIs." am: 0fccecc6a0
am: 83fabf2fd6  -s ours

Change-Id: I9023d8214f0f899d6065a074a92e80dea7359280