am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels."

* commit '24a2ee660aa216d45b06304303c1efa01f011024':
  Collapse code paths for single- and multi-input kernels.