Merge "Use TM SubId in getDataState and getDataActivity" am: 28a7b5974d
am: 08698af50e

Change-Id: I6a4ea5cf947eb8145bbf31d807e76a64980b042e