Merge "Add id to SecurityEvent."