Revert "Remove Device Handler"

This reverts commit 9870749c252f2ca504d1dfb5633dd95d6e598360.

Change-Id: Idc1b9f2bafcd0b317a96d0a696261a8663083e8f