Merge commit 'a1e350eadc066cda734e2dfbbd59eb739c5557de' * commit 'a1e350eadc066cda734e2dfbbd59eb739c5557de': Conditionalized CDMA-specific test.
Merge commit 'a1e350eadc066cda734e2dfbbd59eb739c5557de' * commit 'a1e350eadc066cda734e2dfbbd59eb739c5557de': Conditionalized CDMA-specific test.