Merge "Include stock Dreams in the build." into jb-mr1-dev