am 4e0dd447: (-s ours) am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE

* commit '4e0dd447a6d0ec43c8f9ac79893da09dcb76a0cc':
  Use telephony-common and mms-common. - DO NOT MERGE