am 1a81725e: am 6b115980: Merge "Unhide USAGE_IO_INPUT functions" into klp-dev

* commit '1a81725ececffe68af466d1f8dcea56b86a84247':
  Unhide USAGE_IO_INPUT functions