am 0e83bbaa: Merge "Moving include to static." into klp-dev

* commit '0e83bbaac1c4527ebe5a3e5a9ea5e644de82b326':
  Moving include to static.