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