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

Change-Id: I9a4c6d74f2fb6e2fb98308546b3bd26f7858057c