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

Change-Id: Ida5e7fd88413c772582c3b1568f6fabef9dfd3f1