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

Change-Id: I936632b80fb29dfdd5b201f0a86ee87e89931786