Merge "Add server information for pptp vpn"
am: 1421daa1c3

Change-Id: Ieacc3e883b759d1b95534011f46461c837c4e104