update the device related func
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
update the device related func