Merge commit '49e63562' into mit

* commit '49e63562':
  Use telephony-common

Change-Id: Id4ebefc29019327cb9574b66250d6182c0e575b5