am 2e268478: am b29eeb5a: am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev

* commit '2e26847865bc388531e6cf6e9fc0acfd56e112d2':
  Revert "Always re-establish kernel alarms when considering new alarm set"