device related

Change-Id: I229f4f62b486e79d751d29dd125aa5dd99ae4faa