Merge commit 'bf7c617b' into mit

* commit 'bf7c617b':
  Use telephony-common and mms-common