Merge "supplicant(vts): Compilation fixes" into oc-dev