Merge change I749d6801 into eclair-mr2

* changes:
  Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.