am 8c15b8cf: (-s ours) am 000a2d60: (-s ours) Use telephony-common and mms-common - DO NOT MERGE

* commit '8c15b8cf7fb6527eff8cdb8a0e162f28e863137a':
  Use telephony-common and mms-common - DO NOT MERGE