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

Change-Id: Id08b4260d8f0df05d1f9335936f1afe18824d8c2