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

Change-Id: I94d4593ff8234c9ee4340b3b2e733ae936177e48