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

Change-Id: I399513b63dd5c06bab2946be315cc5c5689dff29