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

Change-Id: I7db1e89e01dd223236f5dc63f9e76392c3a5d897