Merge "Fix build." into jb-mr2-dev