Fixed cleanup for security groups

Change-Id: I79d57bba4b7f3d3abc422fc3b8800b4412327321
Merge "Fixed cleanup for security groups"