Merge "Remove an unnecessary OkHttp dependency"
am: 5b780b08fb

Change-Id: Ia8993d9a2773603a411d5b9ca4c220154267919f