Merge "Fix profile disk space accounting bugs." into oc-dev