Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
17 files changed