Merge change 26566 into eclair

* changes:
  Conditionalized CDMA-specific test.