am 6a64c6cd: Merge "Fix misuse of ArenaAllocator."

* commit '6a64c6cd9922035f26d1f92b52605b9ee37ada6a':
  Fix misuse of ArenaAllocator.