am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.

* commit '8a4c2bb1f07cf1d971290a7310d7b71aceb71590':
  Refactor dream manager to new pattern.