Resolve issue with security groups

Change-Id: If5964c98b5a0f4cc6e408ab040597968f722096c