Removed dependencies on web-security-bundle

Change-Id: I31c8b45d1e21917a746e4624a1c22913cd2d353b