am 128fcea1: Merge "Fix include paths" into jb-mr2-dev

* commit '128fcea1c6f8b5f66a5d88a80789e65aac798416':
  Fix include paths