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

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