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

Change-Id: Id7c06824f5b8eb2abda0a32cbb585e746f32d649