Merge "Fix tests in remote_prov_utils for hwtrust update" into main