am 86974463: Merge "Added support for supports-input manifest element" into klp-dev

* commit '86974463e9e28108e14fa255efd3c429358c0605':
  Added support for supports-input manifest element