Fix DeviceHandler

Change-Id: I83d2df9c48a7e0bea5c3988e239c617303a76114