Final structural tweaks to Telecomm API (5/8)

Bug: 16416927
Bug: 16494880
Change-Id: Ibc2ba9e5d17242380ed3afed359600362bb3e664
9 files changed