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

Change-Id: Ie8d38267581ab3e1bdf4b5373487a2375f8649ed