fork fw-opt_telephony

Change-Id: I27f79391c99b36ba373032c90651e62c9b701caf