Merge "Move ChangeKind to PatchSetAttribute"