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

Change-Id: Ic20c8e4bb4a460ff68b7ef9257406faf368f30c8