am 6f612a61: 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 '6f612a61':
Revert "Always re-establish kernel alarms when considering new alarm set"