Small change to avoid problem in device-less testprops scenario.