More profiling in ChangeHandler

Change-Id: If35eb8fd70ab7931667fd5c55777e667eca1923f
Merge "More profiling in ChangeHandler"