Merge "Add reference counted resources to IpSecService" am: e11366f38a am: adb6437fea
am: 012739e9ad

Change-Id: Iae17a5d33d71e8abf24211cbf2b215520f45c619