Merge "Support record-tgid" am: 924487ec47
am: 0f2ae8e7a7

Change-Id: I07b9e0545a698281e7a6d426f9420df2f4cfe981