Merge "supplicant(vts): More tests" am: 864cae3795 am: f2bf393f6c
am: d5de01439b

Change-Id: Iedf9ad1393d971cb91c11c4b905d3e55ddbd0a41