Merge "Remove IpSecManagerTest" am: 55fb32fd9f
am: db56f31e31

Change-Id: I30c11a19eb8bc09a2f15d641e8441dc0eac5b81f