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

* commit '0f7b02733d870d364bcc8f61eed572aa5e075f5a':
  Fix bug that prevented waking from dream