Remove hidden infomation flow in ChangeOpsMerge

Also remove todos that are done

Change-Id: Ibcb6f180dbafae2dac3dc81cad1fc044afecce87
Merge "Remove hidden infomation flow in ChangeOpsMerge"