Merge "Add some failure comments in VpnTest"