Combining two handlers into one

Change-Id: I059b042f6c816b4239c81748068c7003dc4743c1