Merge "Remove security_v2 flag"