Merge commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90' * commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90': New API 4 with new CDMA constants.
Merge commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90' * commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90': New API 4 with new CDMA constants.