Merge "Include public rather than private headers." into jb-mr1-dev