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

* commit 'd50636542410db761e2fa862e0a660d8cdd0085a':
  Use telephony-common - DO NOT MERGE