Rewriting remaining handlers to objects

Related-Bug: #1325865

Change-Id: I681d4ca851693d42bf3bfd333fd905f45c5da46f
Merge "Rewriting remaining handlers to objects"