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

Change-Id: I99c09cf0132e4696eeacbfb8ba75356ca45a04bc