am 0efb7dcf: Merge "Make changes to Telecomm API per review guidelines." into lmp-dev

* commit '0efb7dcf688ae6a736ff25ebcf98e8ec3475c447':
  Make changes to Telecomm API per review guidelines.