switch opt telephony again

Change-Id: I50fb4d5490339f52179b33632da4acf563f87c46