am 7aa231a1: am 2b9b0de4: Merge "Fix some compaction bugs in string allocation"

* commit '7aa231a188a62a6f6053ae9ae0f632366499fa97':
  Fix some compaction bugs in string allocation