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

* commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116':
  Collapse code paths for single- and multi-input kernels.