attempt to sync opt_telephony with cm

Change-Id: Ie7cf33841e458d06670962450ac8cde02b096891