am bba3a694: Merge "Telephony API extension v2"

* commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1':
  Telephony API extension v2