Merge "The sub_id column in the carriers should be an INTEGER instead of a LONG" into lmp-mr1-dev