Merge "Use a different string for vpn summary." into pi-dev