Merge "Change subId to int from long" into lmp-mr1-dev