am 9b95221e: Merge "Change subId to int from long" into lmp-mr1-dev

* commit '9b95221e5d4efc1678f3342a15c05f293cc79a05':
  Change subId to int from long