Fixes passing arbitrary conductor_api argument

Fixes bug #1158679

Change-Id: Iabe1f58b6139f5619e328a986143e8591b3a02cc
(cherry picked from commit 67628c56caf9d84588a92448880ecdb33eea08b4)