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