Merge "Use a different string for vpn summary." into pi-dev am: a9261b4136
am: fe126d116b

Change-Id: Ia528e8bd3950776669f4b92f89729846d1bca719