Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-dev