Merge "Change subId to int from long" into lmp-mr1-dev
Wink Saville [Mon, 27 Oct 2014 17:35:23 +0000 (17:35 +0000)]

Trivial merge