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

Change-Id: I56e7b7c8198bdb9911e89af2bcf10d32c4280e73