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

Change-Id: I6bb9279597e155d4ae8d1bf2cedbb210245cf0b1