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

Change-Id: Ie103bfbca1422ca69ffba1728afc5d08edffc60f