Merge "Add logs to NextAlarmController"