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

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822