Remove IDeviceHandler reference

Change-Id: I2046e2b5ecca09bfbcc4e90ac447bdececda0405