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

* commit '22017f4edcadedece774b1b4de97fd91ba09033a':
  Change subId to int from long