am 1234f0b4: (-s ours) am 71013cbd: (-s ours) Use telephony-common - DO NOT MERGE

* commit '1234f0b4bc97223a16b70d8f61bc0f04eb6695ed':
  Use telephony-common - DO NOT MERGE