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

* commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23':
  Collapse code paths for single- and multi-input kernels.