Revert "DeviceHandler: Liquify"

This reverts commit 56b7fc4700d44ec10c74165784d2bb0502f6bd3e.
Fix DeviceHandler

Change-Id: I83d2df9c48a7e0bea5c3988e239c617303a76114