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

Change-Id: I547a76c5da5f1ce58ed77853591ec1d4ba8f9318