am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad...
am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit 'ec571bd2':
DO NOT MERGE Fix several bad function definitions.