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

Change-Id: Ib92571667603ce32178a0f75a2177a5668dc8662