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

Change-Id: I17e1355805fa2c439331b0a9814ce5160e0bd168