Merge "Fix Arena allocation tracking." am: 4cb99a13d2 am: c50078606a
am: 10a651b8dc

Change-Id: Ifdc0dab39ff7df6a58d27e1a7b1f095032674974