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

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