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

Change-Id: Id516614e400211478bcf2495ef38e79a6dd4d980