[No reviewer] Fix build issues from alarms merge