Merge commit 'f691758c' into mit

* commit 'f691758c':
  Use telephony-common