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

* commit '29039a2bdbadcc427a966f5e7a6021fd424c4266':
  Always re-establish kernel alarms when considering new alarm set