Merge "Ban socket connections between core and vendor"