am 8e5bf181: am 0f7b0273: am 38586bff: Merge "Fix bug that prevented waking from dream" into mnc-dev

* commit '8e5bf1817e603e2c8343ee0a6f270409a2303d54':
  Fix bug that prevented waking from dream