Merge "Address API review comments for VPN changes."
am: bbfee2b427

Change-Id: I79d035244faeef373751e256f49075d1f2a10faf