Merge "Add a SubId to getDataState and getDataActivity"
am: 9cdec92602

Change-Id: Iaceb3b3370ea189431582317fc79e425d35510f1