Merge "Add TCP info into DataStallEvent" am: 14bc02c66e

Change-Id: Ifaaf0acf80f17b19b399ce52b50f2d0a9731f476