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

* commit '14799fb52105915a2e3164e2139b9504f509211d':
  Moving include to static.