am 16c0b295: am bba3a694: Merge "Telephony API extension v2"

* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2