Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev