Code tweaks to change handler test

Change-Id: I6f03b861eff437df51bbadbaa281bf1205bd021c
Merge "Code tweaks to change handler test"