Merge "Remove condition_manager_v2 flag"