Fix SpecialMergeItems

This has been broken since ChangeOpFactories
was merged

Change-Id: Ib266972e5c64b80595fd9794afe8be5c2336a958
Merge "Fix SpecialMergeItems"