Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev