Merge commit '3d3e307a63144b1bddd534fefd35a557223d52bf' * commit '3d3e307a63144b1bddd534fefd35a557223d52bf': Fix thread safety in DataConnectionTracker.
Merge commit '3d3e307a63144b1bddd534fefd35a557223d52bf' * commit '3d3e307a63144b1bddd534fefd35a557223d52bf': Fix thread safety in DataConnectionTracker.