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

Change-Id: Ic64fbe8847b61eb6bc50736d42bdd3f4f9a4ff26