ChangeOps performance and style clean-up

Change-Id: I9adb6102081871860e99b02b7064880abd285c27
Merge "ChangeOps performance and style clean-up"