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

Change-Id: I0674abcd30ca457c438698e39a9c3473d313b999