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