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

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