Merge "ChangeInserter: fix comparison of Change.Id to Change.Key" into stable-2.9