[PATCH 10/13] Fix reference to 'factory' from within DeviceFactory class.