Merge "Fix warning for rkp_factory_extraction_tool" into main