Merge "[rkp_factory_extraction_tool] adding requireUdsCerts flag" into main