Merge "Fix compaction bugs related to IdentityHashCode"