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