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

* commit '1c546fe0af9b77fae9e07ad139360efb27a46237':
  Use telephony-common - DO NOT MERGE