Merge "Allow vendor ISharedSecret HALs  by any name" into main