am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-dev

* commit '0c9bbf4e13f2be6a4b930da2379c77e06a68c2cb':
  Make DreamManagerService more robust.