am 4fdac613: am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev automerge: 29039a2

* commit '4fdac61388bd25a4a5bf6caef5bee0360e48ab51':
  Always re-establish kernel alarms when considering new alarm set