am 3d3e307a: Merge change 3126 into donut

Merge commit '3d3e307a63144b1bddd534fefd35a557223d52bf'

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