Merge "Cope with angler's whitespace-padded partition size reporting."