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

Change-Id: I25cd3e9cf0dec2522a1515b6de0a284777a7cca8