Merge "Add a SubId to getDataState and getDataActivity" am: 9cdec92602
am: 8e67d8c9f5

Change-Id: I010a6a27fda31ac912884ce0c7d78a596ce3ebee