am d2ad6183: am 1d154f78: Merge "HFA support in services/Telephony for provisioning CDMA devices." into klp-dev

* commit 'd2ad61832a77694adf80067645244716921c0602':
  HFA support in services/Telephony for provisioning CDMA devices.