Cleanup of ChangeOp related code

Change-Id: I858c794f6e548e70bfab54bf3e236f654e1ecd41
Merge "Cleanup of ChangeOp related code"