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

* commit '545a49fe37062e3df87556d7f9bbdda7ad9434e0':
  Use telephony-common - DO NOT MERGE