Merge change 24101 into eclair

* changes:
  Fix CDMA BCD unit test.