Revert "Don't build DeviceHandler just yet..."

This reverts commit c1aa582aa7f91b2f1e4abb7743d8bbec1c1aa87a.

Change-Id: I18bc5c2dbba9e8d65eb2ab1e610b9c7f8b4ce2b0