Fix vendor calling from Muppets now

Change-Id: I9cb8e833e7e5a820618615ad50a65292ccff1778