Add a gadget to replace combo entries.

This gadget will replace combo entries on a few places, making the callsites
a way more efficient, by not needing to fill the combo with all objects
available.

Change-Id: I4a1d976e8794a0bd26ba7f450ffc70fcc6672580