Merge "Support record-tgid"
am: 924487ec47

Change-Id: I165dfc1544b51ac882ee3ffb9f33fe736ee168fd