Merge "Add a SubId to getDataState and getDataActivity" am: 83021ab06c am: 7d9369aaf3
am: 497899de19

Change-Id: I32cf1e27d653b7ac0956986fe57be10c0e01e89d