Merge "Do not compare ID when deduplicating SecurityEvent" into qt-dev am: 8c10c28673
am: 870c6e846c

Change-Id: I818f66d0c4dc1a3c96cf9de3f781e01bb0943b15