Merge "Deal with alarm times near MAX_VALUE"