Merge "More include paths" into jb-mr2-dev