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

Change-Id: Ifb9a2248fe048d0be91499169d3fd201dbb4e4f7