Merge "HFA support in services/Telephony for provisioning CDMA devices." into klp-dev