Merge "Fix build part 2" into jb-mr1-dev