Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev