Merge "Use waitForService in rkp_factory_extraction_tool" into main