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