am 1f42a3db: Merge "Bring back Android Dreams." into ics-mr1

* commit '1f42a3db9e09138f92e8eb16c35cf50e92a88a46':
  Bring back Android Dreams.