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

* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
  Fix issue #7255954: API Review: rename Dream to DreamService