[automerger skipped] Merge "Telecom API updates for mainline support." am: b6377c0bf1 am: 7a7571af31 am: 81995e753d
am: ca9e2ce2cc -s ours
am skip reason: change_id Iaf75b9d671712d791f501c11536e73436908f7de with SHA1 d9da477002 is in history

Change-Id: I11da7e3765db6d470dbb96db5778fd27c4687bab