Fix codestyle in ChangeOpsMerge

Change-Id: Ia4239b23d97b2789e45e8df6169005d13fb184d0
Merge "Fix codestyle in ChangeOpsMerge"