Merge "Dumps total size of primary storage." am: 55dc66dde4
am: 12b387dd87

Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51