Merge "Readability improvements to the Vpn class with no logic changes" am: 2fef505e1e am: a3373bd461
am: 176adeaeda

Change-Id: I81ee1269db73a158eedcc41a6d426abfb9130783