am 76f3b4ec: Final structural tweaks to Telecomm API (5/8)

* commit '76f3b4ec8d9bcb8926db1b3e4fb2d1e969b09fbb':
  Final structural tweaks to Telecomm API (5/8)