Merge "Move CellBroadcastHandler away from deprecated API"