am 86a6913b: (-s ours) Use telephony-common - DO NOT MERGE

* commit '86a6913b36b007477818c699830c77bf536a2afe':
  Use telephony-common - DO NOT MERGE