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

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