Merge "Fix logging defined in external header." into jb-mr2-dev