Merge change 7526

* changes:
  Implement the carrier specified OTASP numbers