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

* commit '428955614836c4a51737e8ff9d4b653c5a80eecd':
  Collapse code paths for single- and multi-input kernels.