am f1b42aff: Change subId to int from long automerge: 830a40f automerge: b7b2cd6

* commit 'f1b42affd9f7cddb05441eefce06709feea91569':
  Change subId to int from long