Merge "Add some failure comments in VpnTest" am: cf8d6e3253
am: 060aa462cb

Change-Id: Ifb3c10aa186d99add321102d503007b857eba78e
tree: c1228a93caedb02431511fa9c8af951564ba845e
  1. tests/