am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev

* commit '29126cf0f7992805b274510420485c95e3741598':
  Ensure we send at least one wakeup/gotosleep transition.