Merge with waihong part. able to delete device.
Merge remote-tracking branch 'origin/master'