Merge "Fix the build" into jb-mr1-dev