Merge "Use TM SubId in getDataState and getDataActivity" am: 28a7b5974d am: 08698af50e am: c51d10eaef
am: 9620dfc6cd

Change-Id: Iab8fcc24ce194862170c9c177c43891c1517c6a9