Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c am: 6ef6ff9c am: 853c565d am: 44f90074 Change-Id: Ie103bfbca1422ca69ffba1728afc5d08edffc60f