Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev