deviceswap changes

device swap change for 2 request to one request