Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network" into lmp-preview-dev