Merge "Fix heap size tracing during bulk thread-local allocations." am: e01ec238cc am: 4bffba2c37
am: d4a00b5bec

Change-Id: Iaf05f36f9d1d813f98f1f34e326b342dd24f087c