Merge "Add events and alarm history expiration period"