am ad37f83c: am 7d5cf703: Merge "Revert "Fix an outstanding compaction bug in interpreter.""

* commit 'ad37f83c7ef51dc2233fe73312410c624c3f46c1':
  Revert "Fix an outstanding compaction bug in interpreter."