Some cleanup in ChangeOpsMergeTest

Change-Id: I466ace6828ca24391321d15c0383d0f76e80779d
Merge "Some cleanup in ChangeOpsMergeTest"