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

* commit '69951e44db967edb098cde3c337e1b665ddbb4f5':
  Fix compaction bugs related to IdentityHashCode