Don't build DeviceHandler just yet...

Change-Id: Id5661e4e41b0677167098d8d98fa1439c30ccb13