Merge "Make DreamManagerService more robust." into jb-mr1-dev