Merge "Final structural tweaks to Telecomm API (2/8)" into lmp-dev