Merge "Make changes to Telecomm API per review guidelines." into lmp-dev