am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev

* commit 'ce802f4898c5747038584596d9d689ca30c34c4e':
  DO NOT MERGE Fix several bad function definitions.