Merge "Fix StatLogger indexing in alarm manager"