Merge change 6392

* changes:
  Add the condition check of ERI for CDMA roaming.