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

Change-Id: I0e15e22f4e1561102012b012cdea74db63ac2163