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

Change-Id: I2ab9a2bd2ff60cafea332998789ad947dda0140b