Merge "Remove ServiceManager usage from IpSecTransform"