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

* commit '37e4a4fdf90a231548aab66148070889c05733d1':
  Use telephony-common - DO NOT MERGE