am 9ad4a898: (-s ours) Use telephony-common - DO NOT MERGE

* commit '9ad4a89877363a6f1128b258f6535b29d2f778e2':
  Use telephony-common - DO NOT MERGE