Merge "Telecom API updates for mainline support." am: b6377c0bf1
am: 7a7571af31

Change-Id: Ieb6b93d6db7c001c83859366c9b3dfde1e67a81d