Track our opt_telephony

Change-Id: Idbf3f46a3a8f3a5d27e09d74fd0aea75ffce647c
Merge remote-tracking branch 'upstream/kk' into kk