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

* commit '0cd356eac4195ac28b9dd54bdbb6d642a69406dd':
  Use telephony-common - DO NOT MERGE