Change subId to int from long
automerge: 830a40f

* commit '830a40f0150ef7e9e34f85062a4f9c0b8fe7ce92':
  Change subId to int from long