Merge "Fix detection of CDMA cell broadcast messages." into jb-dev