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

* commit '27bf55c8159e7f883ddc839453d5a12374ddc50a':
  Telephony API extension v2