Fixes passing arbitrary conductor_api argument

Fixes bug #1158679

Change-Id: Iabe1f58b6139f5619e328a986143e8591b3a02cc
Merge "Fixes passing arbitrary conductor_api argument"
Merge remote-tracking branch 'm_src_repo/master' into build-temp