Merge "Fix invalid original_name key in flavor check"