am cedd573b: am e72a7e1b: am 3c89a0d6: am bf329143: Merge "Make OTASP an explicit option for carriers." into lmp-dev

* commit 'cedd573b5c411acfbb52348913fe6cbd6819627c':
  Make OTASP an explicit option for carriers.