Update to the latest changes

... allow Android to do extra network preparations before the connection is initialized