Track opt/telephony locally

Change-Id: Ie629f6b04c4621a64b546748cc3d8cdc02f31d54