Merge "Remove search_v2 flag"