Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev