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

Change-Id: I8e1ee5ce933d8406c7e43e1f3bb5b23d36756111