Changes handler inherited from abstract

Change-Id: I9f89e3bddc696dfd0a01646e6ee5913717887f12