Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev