Merge "Clean up allocation accounting"
am: c409d4659e

Change-Id: I4b110597d87398a0ae97e8bc8540d1f8357b83cc