Merge "Revert "Add a SubId to getDataState and getDataActivity"" am: ee830a52a6 am: ccd8905426
am: acfa0baad3

Change-Id: I7abf65c068565b7d1b84cd3f71919d591663f060