Merge "Offer to measure disk stats using quotas." am: 8aed997c14
am: 5fcfd07918

Change-Id: I5aaeadb2167ed5b4e4bcfc2ddbd86a05a62e30d1