Merge "Use TM SubId in getDataState and getDataActivity"