Merge changes Ia8c656a0,I01f98255 into sc-dev

* changes:
  Change device-idle alarm fuzzing
  Hold wakeup alarms for as long as possible