Switch to CM's PhoneCommon

Change-Id: Iebd1118d59abe589ca519411bed3c13582eb0c31