adding device support

Change-Id: If0b116e17f1a6767d6ed128b650dcde0b1ddcae7