Merge commit 'e8617bcc' into mit

* commit 'e8617bcc':
  Use telephony-common and mms-common.