Merge "Offer to measure disk stats using quotas."
am: f8720b95be

Change-Id: I56bab3ec4895c232ce8287623827c20f2dbfaaf6