only checked for new VirtualDevice

Change-Id: I64d7a3c6c0894e231cb0644922675dcce0db89fa
(cherry picked from commit f5607f7a440cc54a0a48582ae05c817c8c306b71)