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

Change-Id: I02055dd8c6228b956523c9e12dd76e10d766943f