Merge "Revert "Add a SubId to getDataState and getDataActivity""