Merge "Add a SubId to getDataState and getDataActivity" am: 9cdec92602 am: 8e67d8c9f5 am: 62c556a33c
am: 86d8b8d027

Change-Id: I91dc67ee2633e3ee1eac3e012928242c02315cc7