am c08e6453: Merge "Fix compaction bugs related to IdentityHashCode"

* commit 'c08e6453878da2e064729e01d562973280948ce1':
  Fix compaction bugs related to IdentityHashCode