Merge "Provide a new LLNDK for the vendor api level handling" into main