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

Change-Id: I10be317ba9e6ac1fc6c30eda3db2c3b6b4adabe0