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

Change-Id: I9985c22a03b582450475e8174b739fa0a6d35939