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

Change-Id: Id3a2a3bf4a4922321780be7a6f103674d6922c85