Merge commit '1617706d2529b2182d1a7fe2348495fb8f40bb81' * commit '1617706d2529b2182d1a7fe2348495fb8f40bb81': Add VPN settings classes to Settings app.
Merge commit '1617706d2529b2182d1a7fe2348495fb8f40bb81' * commit '1617706d2529b2182d1a7fe2348495fb8f40bb81': Add VPN settings classes to Settings app.