Merge commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f' * commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f': Revise VpnService to use new vpn.* properties.
Merge commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f' * commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f': Revise VpnService to use new vpn.* properties.