Merge "Remove IpSecManagerTest" into oc-dev
am: d01cb2e802

Change-Id: I8f58ee1ce60c505fb256c4b47a4f8a1d077c50bd