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

* commit 'ff2a49c85cc419acb8c38824c36c46e4c9163dcc':
  Fix bug that prevented waking from dream