Otherwise I'm getting lots of errers when dealing with virtual devices...

Change-Id: I34e145817d21dfc2d30fa9ffdfedfa714467d105