Merge commit 'e0c5d80d' into mit

* commit 'e0c5d80d':
  Use telephony-common

Change-Id: I56b4a75ac390e7710d3c3a9275a68c5dd6d20c2c