Merge "[factory_tool] Update factory tool with new CSR verification param" into main