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

Change-Id: I33cb28b9ca07126e4f1b2631604fccf94ae4b530