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