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

Change-Id: I8c75d1b3836af3acb91f388c88a8a81ab5caec57