Merge "Remove point-to-point assertion in IpSecManagerTunnelTest"
am: 774ee87692

Change-Id: I668f175378fb44bf3c23fb95227c2781df38cc44