Merge "Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1 am: 76ff86d56a"