am 04ef67d9: am 30fb79e5: am f070a957: Merge "The sub_id column in the carriers should be an INTEGER instead of a LONG" into lmp-mr1-dev

* commit '04ef67d972c10162f2ff1bb25a282989d2368450':
  The sub_id column in the carriers should be an INTEGER instead of a LONG