Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea
am: f5ee9c61be

Change-Id: I3a1ffa493f8b11cdd7c8bfff4fa4f8d78d54a169