Merge changes Icbe42286,I26cbcf8a,I3f686c7c * changes: ChangeUtil: Perform some code clean ups Change commit message: Optimize by not re-reading the change Drafts: Optimize deletion by not re-reading the changes