Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev am: b172d5b437
am: c96c65c6ca

Change-Id: I99400a09c15868058fdd4af67c85ace48b33c3bc