am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always...
am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '786cd12f':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"