Fix warnings and general clean up in ChangeHandler

* Fix warnings by introducing instanceof checks.
* Add missing docs.
* More descriptive variable names.
* Fix parameter order.

Change-Id: If258b63807930aacd89cd24da57a1a27648800d6
Merge "Fix warnings and general clean up in ChangeHandler"