Merge "MergeOp: pass updated change to setMergedPatchSet"