deviceswap changes
Merge remote-tracking branch 'upstream/master'
'hardwareswp'
Merge pull request #184 from LAshokReddy556/master

deviceswap changes