Merge "Use hand written hasCode for ChangeIdStateQuery"