Merge "Fix GC memory overhead accounting." into lmp-dev