Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: be87c9ca58 am: 70b000e6e2 am: 0aa55f7b2c
am: 6376859a98

Change-Id: I1ed6962088be8a0999b81a19d84f5c1c7203dddb