Merge "Revert "Add a SubId to getDataState and getDataActivity""
am: ee830a52a6

Change-Id: Ia7d6045d9b604113146a83594940fa1823101a6d