Merge "Fix remove-before-add for IpSecService RefcountedResource" am: 3102fa42a7
am: 46a29e05eb

Change-Id: I416c2e43961ec0e1cc6b2fbcef970fbce858603b