Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea am: f5ee9c61be am: 22d0ed63cc
am: 3b0cf87a5b

Change-Id: I852c8255f837ffeb9d238c74dac5486a971266f5