Merge "Trace heap size for allocations" am: 9ffcfa5fad am: 668110c7ff
am: 1d113d51aa

Change-Id: Ia4545dd20fd2730bc041bb97271bbe7e5447dcb3