Merge "Change some light idle alarms to non-wakeup."