Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27 am: 6ef6ff9ca1
am: 853c565de9

Change-Id: I450f32dbe6ce710afaf81950bcf5b683d2b479a6