Merge "Fix bug with bind()/connect() and IPv4 addresses"
am: 964f576fc3

Change-Id: I5844f9a6257aaa7252774391477a486e440ef617