Merge "Removing lock contention in SecurityLogMonitor" into nyc-dev