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

Change-Id: I0c76f4ac181a49f57486b16de2f98f27c60b2a44