Make ChangeOpsMergeTest compatible with DataModel 1.0

Change-Id: I5e68a7039898f45cfaee3081e27759b9dc91f761
Merge "Make ChangeOpsMergeTest compatible with DataModel 1.0"