Merge "Add a SubId to getDataState and getDataActivity"