Merge "LockAgent: Refactor violation data"