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