Merge commit '917cf0fd' into mit

* commit '917cf0fd':
  Use telephony-common