Merge "[Suggestion] Make suggestion equals and hashcode stable"