am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
automerge: e5b4c12

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