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

* commit '88aaef71289177644f723d3d0f20f34a6f9b3d2c':
  Refactor dream manager to new pattern.