Merge "Revert "Use TM SubId in getDataState and getDataActivity""