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

Change-Id: I621934594ee9239085e6b65b25753222fd080bb6