am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering...
am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
* commit '9a3eacbe':
Revert "Always re-establish kernel alarms when considering new alarm set"