am 6ca289de: (-s ours) Use telephony-common - DO NOT MERGE

* commit '6ca289deea609a0b86dfee24cc30213268600cac':
  Use telephony-common - DO NOT MERGE