Merge "Add unit test for IpSecManager" am: dd494fa91c am: 73b7292a05 am: eb7bc05b32
am: aadf75714a

Change-Id: Iecf36183010f78920ef4112b9b0a0febf4ece82c