Merge "Fixing the build." into jb-mr1-dev