Merge "Change the wakeup alarms for "light-doze-maintenance step" to non-wakeup alarms"