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

Change-Id: I048a7695ec98711163494e3dedab785e1400d1da